Some tweaks to World and Draw plugins