Fixes for new repo installator