Fixes after rebase to master
Fixes after rebase to master

tomashaber/raiden,charles-cooper/raiden,tomashaber/raiden,hackaugusto/raiden,charles-cooper/raiden,tomashaber/raiden,tomashaber/raiden,tomashaber/raiden,hackaugusto/raiden