minor fixes from second test run