More updates for commandline building