fixes few issues