Fis a bunch more internals

Change-Id: I0856cf6b13b3b84433558146595f3d7b0252974f