Bug fixes in has_one and has_many matchers.