cosmetic changes to remove warnings...
...