Fixed a bunch of fails :D