merge leo fixes