Fix conflicting options