Adding some more fixes