Some tmp modifications