Fixes for ha install