Fix some strange lint errors, @whitinge you may need to look here