Updates from recent package changes