Fix all manual merge issues from ykat