Fixes from first test run