Fixes for spec tests.