Forgot a few more pieces
Whoops use y instead of x
Merge pull request #1451 from palantir/protectedScales

Forgot a few more pieces