Bugfixes for usability