Changes to compile with devkit