Fix check for kbuilddir
buildworld fixes