Update change log
Replace weird code that triggers a warning with a functional equivalent