clutch compiler fixes