Fees changes [DNM]

See #442