2014.7 lint fixes

I merged too many too fast, missed some lint....