Small fixes, reverting to add_row for now