Various changes to please quality-assurance checkers