Small Bugfixes & Changes