Fixes for latest ce