Code Review Fixes for RELOAD-237 RELOAD-268 RELOAD-236 RELOAD-226 RELOAD-227