Fix Garrison/Firestone build breaks

A number of skeleton patches no longer applied due to 40a360c
and 54decc8.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
7 files changed