legacy fixes