Fixed syntax problems with the cherry-pickings that were causing compilation issues