Some crucial fixes that prevented Chuck Norris from being awesome