Fix config and sql

Change-Id: I3d46cc48d5827e513b4762f43b6f3fdfa190297f