Fixes for CT.