Added some minor fixes.