Bug fixes 194

I found some more minor bugs in various places as of v1.9.4