Improvements to CLI commands and client
Clean up some compiler warnings