Minor fixes, some unfinished HVA debugging