Additional changes

Forgot to commit these