Minor changes to get api branch compiling