More L4 update fixes