Fix CLI, was broken by code loading.