Fixes for newer Apache stuff