WIP: Fix build errors