diff --git a/data/moves.js b/data/moves.js
index 4d536016b7..129d01e299 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -13076,7 +13076,7 @@ exports.BattleMovedex = {
 		pp: 10,
 		priority: 0,
 		onModifyMove: function(move) {
-			switch (this.weather) {
+			switch (this.effectiveWeather()) {
 			case 'sunnyday':
 				move.type = 'Fire';
 				break;
diff --git a/data/statuses.js b/data/statuses.js
index 6b932e0ef4..a9cbcb40fc 100644
--- a/data/statuses.js
+++ b/data/statuses.js
@@ -409,7 +409,7 @@ exports.BattleStatuses = {
 			return 5;
 		},
 		onModifySpD: function(spd, pokemon) {
-			if (pokemon.hasType('Rock')) {
+			if (pokemon.hasType('Rock') && this.isWeather('sandstorm')) {
 				return spd * 3/2;
 			}
 		},