Minor changes to support top-level directories (If using .htaccess)