build system a bit more fixed?