updates to have apache2.4 compatibility