Fixed last compilation issues.