minor fixes for making outer use of surveillance possible