Bugfixes to CLI and improved CI configuration