Remove the last two warnings