Improve the buildsystem