Small build improvements

Cheers Steffen