Shuttle fixes, embedding fix.