Fixes for controller lock issue - 2nd commit

The controller locks should be 100% fixed.