Pending changes fixed