Small modifications to various files