A few necessary updates