Bugfix, misc