Better support for big installs, improvments