Fix fee payment and name options

Fixes #555.