Minor tweaks

Note that tests already fail for master before these changes.