Fix some bugs on _fill_table(), also add object as second parameter of called closures