Cleaning up warnings with the lates gcc 4.9.1