Make additional APACHE24 changes