Merge fix updates