Added fix to make P* compile with Apache 2.4+