Gamebreaking bugfixes...