Some quick fixes for you.

I tried to make them cherry-pickable.