Fixed Some Listener/Spawn Errors