More tries to fix bugs....