Minor changes on the same topics as the last commit