Fixes to the fadv gateway