Fix problems with shift+R reloading.