more fixes during testing