Couple of build improvements