some fixes i've forgotten for latest l4 changes