Fix a couple method chaining bugs