2014.1 fixes