Follow-up DATA-1371. Quickfix, fix warnings during runtime.