Shark fixes