Various fixes for CREAM CE