Porting code to Fido

Porting recent Bug development to Fido