Fixes remaining build issues related to using the shade plugin where it is most appropriate.