Change to get around gnu compilation warnings