Fixes for Discus Fish (F2Pool)