more fixes to Toast plugin