WIP #82

Fixes three fatal errors