Minor cleanups
More cleanups