tried to fix some build setups