Fix various problems with financial year calculations