Correct some various behaviors causing test failures