other build fixes