Fix options setting issues