Fix some options