Maintenance fixes

A collection of commits to resolve errors and normalize consistency.