Fixing more bugs....