Added some fixes.