A few small tweaks, nothing major.

Dev build. No prod.