Adding follow up fixes