Fixes options issues.