Fix several oversights