Firestick Fixes