Last few build fixes