Improve "rubiness" of a few methods