Testing: minor bugfixes