Fixing a few bugs

Change-Id: Ibc65ad1d41fca4a6244b246cd30428965f707227
5 files changed