Minor changes to stuff