Minor installation-related modifications