af-main: Fix 2 bugs