Forgot to apply two changes in previous commit