Finished a few issues