Cleanups, automaster fix, bins.