- Fix a few definitions + RefParam is private