Updated build settings to make things cleaner tomorrow;