Deal with compatibility problems between Apache versions
Ready for release