Fixing the RPM things I broke earlier in the day...