Fix: Multiple FDB issues

Merged Akshay Bharambe requested to merge fdb_fixes into devbranch