Fixed currency issues and on load table check