Misc fixes. More relaxed visibility for some class fields.