A few improvements prior to v3 release