Minor changes in preparation for #23