Small fixes: database tuples..