[AfterFinal] Fix some minor bugs