More fixes, CurrencyEngine should work now