Fixed some bugs in Finance controller