More updates for 1.6