Minor fixes from @danielbeardsley's comments