Fix syntax issues and recovery generation

Change-Id: I2394ffb16fa06421c5f0cc5f5ee77db72d3399ba
3 files changed