Fixed CLI flags