Minor cleanups/enhancements