Make building a bit more pleasant