Minor changes to everything