Spec fixes, updates for Corundum