Fixing Unix build issues