fix issues on building