Minor cleanups and updates for 10.10