spec bug consolidation and fixes