Fix up some configs

Change-Id: Ia3cb37576b508a3da6a8ad06bd041786de0abb9f