Fix some bugs…not sure why the tests didn't catch these.