Fixed a couple of bugs in the manifest + reloading