Small cleanup, better error reporting, better reinstall fallback