Build times

This might be related to the issue mentioned here: