Fixes.
Merge remote-tracking branch 'github/swat' into swat