Bugfixes in commands