Fixed Warnings

Now builds -Wall clean on Linux-g++ 4.6.3