several fixes during testing