Legacy corrections