Final callow fixes for shells