fixes during test dev