Fix some failures; abandon acts_as_list