Fix merge issues from earlier commit