Fixed some options bugs