Adjust init values a bit more