Small changes to types in order to get examples running