Add workarounds/fix issues with change event