Changes for compatibility with Apache 2.