Some tweaking to handling of Reimage Magery