Changes to address issues found from LMS unit tests.