Clean ups to shield improvements.