fixes for v 2.1