Fix build

Rebase two of these files completely