Merge "Fix build" into ub-now-nova