compilation issues fix