minor fixes with merge