Some changes to make the code compile without warnings under Mac OS X + ...

...clang