fixes for open issues