CREAM CE fixes