Small fixes based on my tests on OSX

I didn't have the chance to test the "--render"-fix on other platforms. But I guess it will work fine there too.