More fixes to embedded scripts.