A few fixes to get zipped installer working correctly

Very simple changes, but needed to get things working properly for me.