Adding Fixes for some options