Fixes Neil's 2 things in #230.