Compile fixes following refactor