more apache changes