Preliminary fixes on L1 RHW-3
Full rebuild on L1 RHW-3