More issues fixed

Important remain: Endgame produced this crash:
http://hastebin.com/urepubuqof.sm