A few improvements to make it run out the box better