Modified some defaults