Improve handling of timed builds