Small updates and a rebuild