Update to apache conf, misc changes