Update for crash and compilation fix for latest in the branch