Fixes for 2.0