buildsystem fixes