Minor fixes to make IE9 shut the fuck up