Fixes from hangout.