Some specialization fixes.