• minor fixes for latest version compatibility