Build improvements - less repetition