Fixed few issues after merge