Summary: Fix some typos and handle different DB versions