Another build fixes