Fixes for warnings after upgrading to Nikola 6.4.0