Various Shedd related fixes