Fix some TODOs

* Make a private class prooerty protected
* Update type hints

Change-Id: I3cec052799b4e5bcf69ec6b351d084dc8bd965e0