REF #4121 lint fixes