Fix minor compilation issues

Hello,

Please pull the following commit. It fixes some minor compilation issues I encountered under Ubuntu 12.04.2 LTS with gcc 4.6.3.

Thanks a deal!

Regards,
Cristian