First try at fixing protected members.