Fix some build errors, catch missed CLI examples