Minor tweaks to db.go and main.go