Fixed a few issues with reloading/disabling