Fixing some options
Mani changes