Bug fixes related to reloading and a few others