Fix up options