fixes for last yoda version