dumb compile fixes and such