Fixing failed builds, also changing attributes from private to protected