Fix the build and up to 19