Fixes and add-ons for mode_compute

Deals with #507 and #508