Minor changes to various parts of the code.