Small cleanups, new bins.