Fix build and auth