New fixes for CP2013