Fix: Failing build

This PR applies some fixes so the current build at least passes.