Do version checks in one place, fix check when setting options