af-main: Bug fixes