RELOAD-212, RELOAD-211: code review issues fixed.