merge fix ups