Fix Unix build issues