[2875] Make build work