Fixes a couple step variables