Fixed options, minor things