Fixed options bugs