Fix shell and monitoring enable/disable issues