Fix various issues.

8 jobs for !1 with ewlsh/typed in 12 minutes and 17 seconds (queued for 2 minutes and 10 seconds)
latest merge request