Various config changes/improvements