Fixes for EFT fit support in shop