BAO cleanup + fix enter/leave in zone