Minor style and DB fixes