Architecture libraries fixed