Fixing #759
Fixing some warnings that come up with gcc 4.8