various build clean ups & fixes