Cleanup issues discovered during OpenShift deployment

Related to #88