fix bugs

Change-Id: I6d3efe61eb6e4de93f84314886421d5f936efc21
Merge "fix bugs" into 0.3.x-scheduler