Address CLI path issues