Fixes for reinstall