Some Bugfixeds