Fixes on amount validators. fixes #1054