more fixes for freeze 2014_11