Minor bug fixes

Change-Id: I94e4521adf76a6c77db954c4a8955168e9d37b55
2 files changed