Fixed a few issues in review