Merged open issues from original repo