Fixing minor bugs...