Some compilation issues fix