#1058 More specs stabilization