Fixed conflicting options behaviors