Changed some default values

Change-Id: I0b51ae8e72d2ed6229dfed03a42ac6cc0c970b73