Fixed up hacks/objects