Patches v3 update

Fixed errors with CRF and forwarded USKP fixes.