Fix XP bar and OS X build update