Fixes for spec.