More compile fixes... still doesn't compile