Hotfix things from private to protected