Last minute stuff before another merge