Changed some options defaults