Fix various minor configuration issues.

Signed-off-by: amit <amit@wibidata.com>