fix some spanner bugs