Updates to support running under Apache