varius fixes