Uncomment some needed options