[0.0.28m] Some fixes for warnings to clear them up.