Fix deprecation warnings

This commit fixes some deprecation warnings that are caused
by missing @ signs in templates.

Partial-Bug: #1260874