Fixes for issues based on review and initial testing for milestone
1.7.3.