Make builds easier