Multiple fixes not production yet.