[PATCH v1 0/2] Fix couple of bugs reported by Canonical