Fix things to work out of the box with sqlite3