another round of editor compile fixes