diff --git a/src/components/Farmhand/Farmhand.js b/src/components/Farmhand/Farmhand.js
index fd45b80f0..86ca125ed 100644
--- a/src/components/Farmhand/Farmhand.js
+++ b/src/components/Farmhand/Farmhand.js
@@ -490,7 +490,11 @@ export default class Farmhand extends Component {
       selectHoe: () => this.handlers.handleFieldModeSelect(CLEANUP),
       selectScythe: () => this.handlers.handleFieldModeSelect(HARVEST),
       selectWateringCan: () => this.handlers.handleFieldModeSelect(WATER),
-      selectShovel: () => this.handlers.handleFieldModeSelect(MINE),
+      selectShovel: () => {
+        if (this.state.toolLevels[toolType.SHOVEL] !== toolLevel.UNAVAILABLE) {
+          this.handlers.handleFieldModeSelect(MINE)
+        }
+      },
       toggleMenu: () => this.handlers.handleMenuToggle(),
     }
 
diff --git a/src/data/achievements.js b/src/data/achievements.js
index 144f35083..c38421637 100644
--- a/src/data/achievements.js
+++ b/src/data/achievements.js
@@ -6,6 +6,7 @@ import {
   getCropLifeStage,
   getProfitRecord,
   integerString,
+  isOctober,
   memoize,
   moneyTotal,
   percentageString,
@@ -109,7 +110,7 @@ const achievements = [
     name: 'Halloween Harvest',
     description: 'Play Farmhand in October and get the gift of the season.',
     rewardDescription: `${reward} units of ${itemsMap.jackolantern.name}`,
-    condition: () => new Date().getMonth() === 9,
+    condition: () => isOctober(),
     reward: state =>
       addItemToInventory(state, itemsMap.jackolantern, reward, true),
   }))(),