Draft: minor bugfixes