General fixes

To make it run out of the box with a fresh install by just following the instructions.