schema breaking fixes