Minor changes in different places