Proposed fixes to Monk

[shinkin]

This feels more like a tourniquet. They fixed they immediate issue with a quick and easy fix. Later when there is more time they will do the serious changes needed.

My thoughts exactly, I think some of these changes may even be rolled back