still some L1 related fixes