Fix build path errors during the last merge and silence a few warnings.