Fix SW -- parameters were mixed up
Fix compile (for rust language updates)