2014.1 Lint fixes