Some necessary updates