Fixed some fishy bugs