Fix bugs in new options