Fishing rod overrides, some other changes, and fixes