Fixes for v2.1