Fix first merge issues