Small modifications made to various files