superfish related fixes