Schema fixes

/cc @adgad This makes a breaking change the schema, which means all notifications will be lost. Hope that's not a big deal.