Changes for apache24