Base install improvements