fix issues in afix for advancing
Reviewer: Dan Jao (post-commit)