Merge "Yet more minor fixes on User HAL:" into rvc-dev