Fixing some minor bugs....