Yet More Minor Fixes to CLI, Finance, Resources