Fix the Steve-isms