minor changes due to fix subpar merge that broke all tests