Fixed small issues when you set some properties to default