Fix outstanding issues as found in the test room