Some fixes for 2.01