Getting started fixes

Replaces https://github.com/wet-boew/wet-boew/pull/6066.