Apache 2.4 fixes