Deprecation and undeclared warnings tweaks.