Fixing further bugs.