[PATCH] Diff updates to express type changes