Fix warning again

Though my request #415 was merged (thank you cool guys!), my compiler GCC4.7 still blames me.
It seems that I missed some warnings or dark matters attacked on my machine...

I'll send PR again to wipe them out them.

I believe these changes are too small to break compatibility or logical correctness.