Made some small changes to work with Apache