Yet more changes. Currency fixes.