Fix two minor issues