Fixes to acts_as_flaggable has_one relation