Fixes for 2.1