warnings removed
fixes
fixes again
Merge pull request #896 from dcoeurjo/warnings

warnings removed