Fix remaining spec failures.