Fixed all warnings in 2014 update