Various Shedd fixes