Fix some issues found in review and an issue scanbuild found
feature/loader-registration-cleanup
2020-02-23, Gary Kramlich