Fix stuff on options