Fixes complilation problems in ha