Fixup dictionaries

Signed-off-by: David Henningsson <david.henningsson@canonical.com>