Fixed a few things on shields