Fixed option types