solve some more problems
Signed-off-by: Shi Chen <cscs54cs@gmail.com>