misc changes to make compiling successful on my machine