Some tweaks to allow monitoring