Uninstall.php fixes