Fix various issues with qless build.