Tweaks to world commands