Base url (index.php inclusion) fixes