Small start changes for not installed system