Fix build for Full flavor