Tweaks to get remote task running