Build: Fix load order issues

Re gh-7719