Follow up for #250

Here are the things that were missing in #250.