Some tweaks to #1