Slowly fixing merge issues.