Fixes for more recent apache