Fixes in monitor app