Fixed more bugs.