Additional Feral Fixes