Minor tweaks to rover code