Fixes for install process