Small fixes uncovered during testing