Few compilation error fixed