Fixes on ActiveRecord Class