Fixing more bugs...