Fixing more bugs.