changes to fix issues