Fixing octopus build