Some changes .. for fixing not building