fix issues on host