Fixed some options issues