Updated a few files to make everything work correctly