Added some more fixes