Change a few basic settings

Change-Id: Icd1f18f662df1706df651a8fe2c870cf620c0502