Minor changes that still somehow took forever