fixing build issues for Max (autobuild)