Fix some very minor code quality issues