fix issues with setup