Hotfix/2014.1 lint fixes