Adding few more fixes