Minor fixes

Here are some changes i made to get things working in my environment.