Fixes for `ember-beta` scenario failures #870

Job	Run time
Tests	54s
Floating Dependencies	1m 11s
ember-lts-4.4	1m 33s
Type checking - typescript-4.2	1m 22s
ember-lts-4.8	1m 35s
Type checking - typescript-4.3	1m 22s
ember-release	1m 44s
Type checking - typescript-4.4	1m 24s
ember-beta	1m 35s
Type checking - typescript-4.5	1m 25s
ember-canary	1m 52s
Type checking - typescript-next	1m 22s
embroider-safe	1m 35s
embroider-optimized	1m 33s
	20m 27s

Provide feedback