#1138 fixes for specs