fix multiple issues during testing