fixes for semvarwq