Fix minor bugs with apache.