Complete build fixes. It builds!