Correct some issues sneaked in from copy pasto