Update some class/fields visibility for easier overriding