Fix bug 1368 and 1369

Change-Id: I3c88b3a9295ce0b105410a76356e88da0f1e24a5
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 files changed