Better handling of install options