Fixed open issues