misc: updates to get compiling