immediate fixes during testing