Resolved a few issues