a few more changes to apache