Gunrack and Fire Barrel tweaks