Fix the options system