Minor changes to the code here and there.