Fixing bugs...