Fix final build errors#39

mirmirmirr merged 2 commits intomain-previewplan-cake/frontend:main-previewfrom

last-build-fixesplan-cake/frontend:last-build-fixesCopy head branch name to clipboard