Minor changes to fish and ST3