fix issues since we have hw to compile on