Unreviewed, non-unified build fixes after r294166