fixes for lars fixes