Couple More Bugfixes