Build: Fix all build issues up to this point