Fixed a few issues.