Update Changelog and add one more macosx workaround