Fix a couple method chaining bugs (by jdorn)