Try to speed up build