conversion to 2014.1 and cleaning critical warnings