af-main: bug fixes