More fixes for FIDO