Fix up install functions

Change-Id: I62110806f60cd923fb761f5e5f2544da3d5b68b1