Missing in_hiding stuff

Can't test this, committing to see if it affects anything.