Some fixes in Fish.java