fix(*): minor adaptions for l4