Fixes to Shark Thrasher