Make bootstrap script work in more situations