Fix build with devkit changes