Correct usage of embedded HAL objects
Small template updates