Remove warnings [Fixes #869]