Even more fixes (Due to millinair not uploading all at once)