Removed/suppressed false warnings. Fixes #936