fix use of deprecated stuff