MAINTAINERS: Various fixes