fixes from upstream

source: RubyMoney/money@e46540990da5f236b715eb4e218c7092eefa9e48