some fixes for freeze2014_11