Fix some code before PR