Fix stuff at CLI