Improve loading order on CLI; fix