Fix database config, add address normalization