Fixed some hacks