Fixes in 'xdb', clean after GSON, db conn check