More updates for #64