Small fixes and enabling the monitor.