Minor changes to the source