Fixed defects while compilation