WTF!! Other build fixes!!