Fixed bug with adaptModel lockedAttributes hash

- Also added fixed to trickle _isEnabled