Fixes for installer