Couple minor code quality fixes.