Various Fixes

Fixes #408
Fixes #418
Fixes #419