first fixes for latest version