Post production bug fixes

The bug fixes for post production issues. These fixes address some of
the tickets created by Alterra. The fixes are for the issues which ICF
agreed to fix in the final conversation with Alterra.