Trying to fix some more bugs.