Smaller changes to #341