No more warnings in tomahawk code