Minor changes to keep up