Fixed the open issues