HAL-64: Fixes for standalone mode