Minor fixes for SAMDL copy/paste.