Fixing some minor issues with change events