More updates for 2.1.2