Forgot some other case fixes