Minor updates and fixes for 2.1v.