Zing's Bugfixes