Resolving few issues