Fixes in toolkit for sms and execution