Modifications for building under CM10.2