Fix failed case and lint warning