Fix possible (and real!) compilation issues.