Added some more fixes.