Update to LAM2r16
More update 5 compat