T6 small fixes, objs