More updates for 1.1