Fixing a few issues...