Forgot to commit these in the Chingu switchover