Changes to enable docker install