Adjustments for OpenShift; plus style adjustments