Tweak cli output and fix related warnings