Opts and fixes