Further apache cookbook changes