Coder violation fixes.
Merge pull request #16 from MorganDawe/7.x.merge_fix

Coder violation fixes.