Tweaking for 2.1 release