minor fixes in monitor mode