Additional changes for Apache 2.4 compatibility