Polished stuff for v1.6 release