buildtime fixes