Bug Fixes on Fish/Orc