Fixing a few minor issues found when using as basis for real project