Few Bugfixes