Hopefully speed up builds