Code build fixes