Bug fixes

Add a couple of bug fixes.
A database configuration is now not required.