fix also some obsolete usage