more adjustments for latest specs version