Build fixes first.