Updated a bit to work again with current OpenShift.