Fixed all the error for PUP smoke test.