Fixed several bugs in options fields