eric4 compat and minor fixes