Minor changes to addres issues raised in #91