Fixed CLI pieces.