Bugfixes inside index.php