Fix attributes to match server requirements