Fix oversights