Fixes for new spec.