Another set of fixes that pushes compilation a little bit
further.