Fixing a few issues.