Improvements to the Apache section