CLI post: bug fixes