Fixing minor bugs.