Merge "hal: fix for KW issues."