[[ LC 6.7 rc3 build ]] Tweaks to make things compile