Bundle with fixes for some open issues