Fixes a couple of shroud issues