A few minor fixes

Mostly around nits in how we serialize policy and installers