Ad and FF fixes

:+1: