Fix option validation