Applied some SharpTox changes, again