Fixed some surveillance bugs