Add Looki's changes

Mainly fixes for HWA