Merge "Some build fixes" into experimental