Some minor things as the work stalled