Fix work more info issues