Fix bugs related to ActiveRecord revamp