Patches from LARC applied.