fixes for lastest versions