Another set of code quality fixes