Strict checks where applicable.
Merge pull request #1711 from dereuromark/2.5-strict

Strict checks where applicable.