Fix build and warnings