Minor changes to allow for servers without mod-rewrite