Merge fix changes