Small tune-up changes