Fix some minor issue